From 4291350f89e3e4d17c0587076cbb73e25cf49077 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 23 Mar 2001 22:21:06 +0000 Subject: [PATCH] fix up some docs 2001-03-23 Havoc Pennington * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up some docs 2001-03-23 Havoc Pennington * gdk/gdk-sections.txt: updates * gtk/gtk-sections.txt: updates * gtk/gtk-docs.sgml: mop up TreeModelSimple entity * gdk/gdk-docs.sgml: remove input method and input context docs --- ChangeLog | 5 + ChangeLog.pre-2-0 | 5 + ChangeLog.pre-2-10 | 5 + ChangeLog.pre-2-2 | 5 + ChangeLog.pre-2-4 | 5 + ChangeLog.pre-2-6 | 5 + ChangeLog.pre-2-8 | 5 + docs/reference/ChangeLog | 11 + docs/reference/gdk/gdk-docs.sgml | 4 - docs/reference/gdk/gdk-sections.txt | 47 +--- docs/reference/gdk/tmpl/gdk-unused.sgml | 115 ++++++++ docs/reference/gdk/tmpl/windows.sgml | 38 +++ docs/reference/gtk/gtk-docs.sgml | 1 - docs/reference/gtk/gtk-sections.txt | 248 ++++++++++++------ docs/reference/gtk/tmpl/gtk-unused.sgml | 68 +++++ docs/reference/gtk/tmpl/gtkbox.sgml | 9 + docs/reference/gtk/tmpl/gtkbutton.sgml | 18 ++ docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 9 + docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 18 ++ docs/reference/gtk/tmpl/gtkcontainer.sgml | 27 ++ docs/reference/gtk/tmpl/gtkdialog.sgml | 37 +++ docs/reference/gtk/tmpl/gtkentry.sgml | 54 ++++ docs/reference/gtk/tmpl/gtkframe.sgml | 9 + docs/reference/gtk/tmpl/gtkiconfactory.sgml | 191 ++++++++++++++ docs/reference/gtk/tmpl/gtkimcontext.sgml | 9 + docs/reference/gtk/tmpl/gtklabel.sgml | 94 +++++++ docs/reference/gtk/tmpl/gtkliststore.sgml | 11 - docs/reference/gtk/tmpl/gtkprogressbar.sgml | 36 +++ docs/reference/gtk/tmpl/gtkrange.sgml | 18 ++ docs/reference/gtk/tmpl/gtkstock.sgml | 7 + docs/reference/gtk/tmpl/gtktextbuffer.sgml | 28 ++ docs/reference/gtk/tmpl/gtktextiter.sgml | 74 ++++++ docs/reference/gtk/tmpl/gtktextmark.sgml | 9 + docs/reference/gtk/tmpl/gtktextview.sgml | 14 + docs/reference/gtk/tmpl/gtktogglebutton.sgml | 18 ++ docs/reference/gtk/tmpl/gtktoolbar.sgml | 26 ++ docs/reference/gtk/tmpl/gtktreemodel.sgml | 18 ++ docs/reference/gtk/tmpl/gtktreestore.sgml | 7 +- .../reference/gtk/tmpl/gtktreeviewcolumn.sgml | 25 ++ docs/reference/gtk/tmpl/gtkwidget.sgml | 79 ++++++ docs/reference/gtk/tmpl/gtkwindow.sgml | 161 ++++++++++++ gtk/gtkimcontext.c | 5 +- gtk/gtklabel.c | 9 +- gtk/gtklabel.h | 2 +- gtk/gtktoolbar.c | 2 + gtk/gtktoolbar.h | 2 +- gtk/gtktreemodel.c | 6 +- gtk/gtktreestore.h | 2 +- 48 files changed, 1453 insertions(+), 148 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3580ad38d0..37fc9945c6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-03-23 Havoc Pennington + + * gtk/gtktoolbar.c, gtk/gtkimcontext.c, gtk/gtklabel.c: fix up + some docs + Fri Mar 23 16:13:43 2001 Jonathan Blandford * gtk/gtktreeviewcolumn.h (GtkCellDataFunc): Forgot to namespace diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index c2a4ca35ac..31e9f0ca46 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,14 @@ +2001-03-23 Havoc Pennington + + * gdk/gdk-sections.txt: updates + + * gtk/gtk-sections.txt: updates + + * gtk/gtk-docs.sgml: mop up TreeModelSimple entity + + * gdk/gdk-docs.sgml: remove input method + and input context docs + 2001-03-22 Havoc Pennington * gdk/tmpl/keys.sgml: docs on GdkKeymap diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index f18fd17997..529abac025 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -12,9 +12,7 @@ - - @@ -70,8 +68,6 @@ &gdk-Input-Devices; &gdk-Pango-Interaction; - &gdk-Input-Methods; - &gdk-Input-Contexts; &gdk-X-Window-System-Interaction; diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 437fa094fe..a5e4ede7ef 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -381,7 +381,7 @@ GdkWindowAttributesType GdkWindowHints GdkGeometry GdkGravity - +GdkWindowTypeHint gdk_window_new gdk_window_destroy gdk_window_ref @@ -452,6 +452,9 @@ gdk_window_set_colormap gdk_window_get_user_data gdk_window_get_geometry gdk_window_set_geometry_hints +gdk_window_set_icon_list +gdk_window_set_modal_hint +gdk_window_set_type_hint gdk_window_get_position gdk_window_get_root_origin gdk_window_get_size @@ -529,25 +532,6 @@ GdkPropMode gdk_property_delete -
-Input Methods -input_methods -GdkIMStyle -gdk_im_ready -gdk_im_decide_style -gdk_im_set_best_style - - -gdk_im_begin -gdk_im_end - - -gdk_iswalnum -gdk_iswspace -GDK_HAVE_WCHAR_H -GDK_HAVE_WCTYPE_H -
-
Pango Interaction pango_interaction @@ -561,24 +545,6 @@ gdk_pango_layout_get_clip_region gdk_pango_layout_line_get_clip_region
-
-Input Contexts -input_contexts -GdkIC -gdk_ic_new -gdk_ic_destroy -gdk_ic_get_events -gdk_ic_get_style -gdk_ic_get_attr -gdk_ic_set_attr - - -GdkICAttr -GdkICAttributesType -gdk_ic_attr_new -gdk_ic_attr_destroy -
-
Points, Rectangles and Regions regions @@ -882,7 +848,10 @@ GdkCursorPrivate GdkFontPrivateX GdkImagePrivateX11 GdkVisualPrivate -GdkICPrivate gdk_display gdk_root_window +GDK_HAVE_WCHAR_H +GDK_HAVE_WCTYPE_H +gdk_iswalnum +gdk_iswspace
diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index a74714d9b8..de291a61e2 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -23,6 +23,121 @@ routines for allocating colors (deprecated). Color Contexts + + +A #GdkIC input context is used for each user interface element which supports +internationalized text input. See the +Input Methods section for an overview +of how internationalized text input works in GTK+. + + + + + + + + + + +internationalized text input properties. + + + +Input Contexts + + + + +Input Methods provide a way for complex character sets to be used in GTK+. +Languages such as Chinese, Japanese, and Korean (often abbreviated to CJK) +use a large number of ideographs, making it impossible to support all +characters with a simple keyboard. Instead, text is usually +pre-edited using a phonetic alphabet and then +composed to form the ideographs. + + +GTK+ makes use of the input method mechanism provided by the X Windows +platform. When a GTK+ application is started, it opens a connection to the +input method appropriate for the current locale (if any). + + +Widgets which handle textual input, such as #GtkEntry, need to do a number of +things to support internationalized text input: + + +When the widget is realized: +Check if an input method is being used with gdk_im_ready(). +If it is, create a new Input Context +using gdk_ic_new(). Find out which events the +Input Context needs to receive +with gdk_ic_get_events(), and make sure that the widget's window receives +these events using gdk_window_set_events(). + + + + +When the widget's size, state or cursor position changes: + +Update the appropriate +Input Context attributes +using gdk_ic_set_attr(). + + + + +When the keyboard focus enters or leaves the widget: + +Call gdk_im_begin() or gdk_im_end() to start or finish editing the text. + + + + +When the widget receives a key_press event: + +The string and length +fields of the #GdkEventKey struct should be used to insert the composed text +into the widget. + + + + +When the widget is unrealized: + +Destroy the Input Context. + + + + + + +See the XLib reference manual for more detailed information on input methods, +and the #GtkEntry and #GtkText widgets for some example code. + + + + + + + +Input Contexts + +Used for each widget that handles internationalized text input using the +global input method. + + + + + + + + +support for internationalized text input. + + + +Input Methods + + This macro contains an integer value representing diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index a28540f9ed..c8ec886141 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -121,6 +121,16 @@ Windows @GDK_GRAVITY_SOUTH_EAST: @GDK_GRAVITY_STATIC: + + + + + +@GDK_WINDOW_TYPE_HINT_NORMAL: +@GDK_WINDOW_TYPE_HINT_DIALOG: +@GDK_WINDOW_TYPE_HINT_MENU: +@GDK_WINDOW_TYPE_HINT_TOOLBAR: + @@ -722,6 +732,34 @@ Windows @flags: + + + + + +@window: +@pixbufs: +@Returns: + + + + + + + +@window: +@modal: + + + + + + + +@window: +@hint: + + diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index b8ed6c4d41..bbc1d256df 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -279,7 +279,6 @@ An advanced widget set. >k-GtkTreeStore; >k-GtkTreeViewColumn; >k-GtkTreeView; - >k-GtkTreeModelSimple; >k-GtkTreeModelSort; >k-GtkCellRenderer; >k-GtkCellRendererPixbuf; diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 02d47762a7..e849d14cb7 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -93,10 +93,6 @@ GTK_ASPECT_FRAME_GET_CLASS GtkButtonBox GtkButtonBox GTK_BUTTONBOX_DEFAULT -gtk_button_box_get_child_size_default -gtk_button_box_get_child_ipadding_default -gtk_button_box_set_child_size_default -gtk_button_box_set_child_ipadding_default gtk_button_box_get_spacing gtk_button_box_get_layout gtk_button_box_get_child_size @@ -105,7 +101,6 @@ gtk_button_box_set_spacing gtk_button_box_set_layout gtk_button_box_set_child_size gtk_button_box_set_child_ipadding -gtk_button_box_child_requisition GTK_BUTTON_BOX GTK_IS_BUTTON_BOX @@ -144,6 +139,7 @@ gtk_box_set_spacing gtk_box_reorder_child gtk_box_query_child_packing gtk_box_set_child_packing +gtk_box_get_spacing GTK_BOX GTK_IS_BOX @@ -160,8 +156,8 @@ GTK_BOX_GET_CLASS GtkButton gtk_button_new gtk_button_new_with_label -gtk_button_new_accel -gtk_button_new_stock +gtk_button_new_with_mnemonic +gtk_button_new_from_stock gtk_button_pressed gtk_button_released gtk_button_clicked @@ -210,6 +206,7 @@ GtkCheckButton GtkCheckButton gtk_check_button_new gtk_check_button_new_with_label +gtk_check_button_new_with_mnemonic GTK_CHECK_BUTTON GTK_IS_CHECK_BUTTON @@ -230,6 +227,8 @@ gtk_check_menu_item_set_state gtk_check_menu_item_set_active gtk_check_menu_item_set_show_toggle gtk_check_menu_item_toggled +gtk_check_menu_item_get_inconsistent +gtk_check_menu_item_set_inconsistent GTK_CHECK_MENU_ITEM GTK_IS_CHECK_MENU_ITEM @@ -460,6 +459,9 @@ gtk_container_forall gtk_container_child_composite_name gtk_container_set_border_width gtk_container_dequeue_resize_handler +gtk_container_propagate_expose +gtk_container_set_focus_chain +gtk_container_unset_focus_chain GTK_CONTAINER GTK_IS_CONTAINER @@ -586,20 +588,6 @@ GTK_IS_CURVE_CLASS GTK_CURVE_GET_CLASS -
-gtkdata -GtkData -GtkData - -GTK_DATA -GTK_IS_DATA -GTK_TYPE_DATA -gtk_data_get_type -GTK_DATA_CLASS -GTK_IS_DATA_CLASS -GTK_DATA_GET_CLASS -
-
gtkdialog GtkDialog @@ -613,6 +601,10 @@ gtk_dialog_response gtk_dialog_add_button gtk_dialog_add_buttons gtk_dialog_add_action_widget +gtk_dialog_get_has_separator +gtk_dialog_set_default_response +gtk_dialog_set_has_separator +gtk_dialog_set_response_sensitive GTK_DIALOG GTK_IS_DIALOG @@ -698,6 +690,12 @@ gtk_entry_set_visibility gtk_entry_set_invisible_char gtk_entry_set_editable gtk_entry_set_max_length +gtk_entry_get_activates_default +gtk_entry_get_has_frame +gtk_entry_get_width_chars +gtk_entry_set_activates_default +gtk_entry_set_has_frame +gtk_entry_set_width_chars GTK_ENTRY GTK_IS_ENTRY @@ -812,6 +810,7 @@ gtk_frame_set_label gtk_frame_set_label_widget gtk_frame_set_label_align gtk_frame_set_shadow_type +gtk_frame_get_label GTK_FRAME GTK_IS_FRAME @@ -1006,6 +1005,27 @@ GtkImageStockData GtkImageType
+
+gtkimagemenuitem +GtkImageMenuItem +GtkImageMenuItem +GtkImageMenuItemClass +gtk_image_menu_item_add_image +gtk_image_menu_item_get_image +gtk_image_menu_item_get_type +gtk_image_menu_item_new +gtk_image_menu_item_new_from_stock + +GTK_IMAGE_MENU_ITEM +GTK_IMAGE_MENU_ITEM_CLASS +GTK_IMAGE_MENU_ITEM_GET_CLASS +GTK_IS_IMAGE_MENU_ITEM +GTK_IS_IMAGE_MENU_ITEM_CLASS +GTK_TYPE_IMAGE_MENU_ITEM + + +
+
gtkimcontext GtkIMContext @@ -1016,6 +1036,7 @@ gtk_im_context_filter_keypress gtk_im_context_focus_in gtk_im_context_focus_out gtk_im_context_reset +gtk_im_context_set_cursor_location GTK_IM_CONTEXT GTK_IS_IM_CONTEXT @@ -1147,13 +1168,22 @@ gtk_label_new gtk_label_set_text gtk_label_set_attributes gtk_label_set_markup -gtk_label_set_markup_with_accel +gtk_label_set_markup_with_mnemonic gtk_label_set_pattern gtk_label_set_justify gtk_label_get gtk_label_parse_uline gtk_label_set_line_wrap gtk_label_set +gtk_label_get_layout_offsets +gtk_label_get_mnemonic_keyval +gtk_label_get_selectable +gtk_label_get_text +gtk_label_new_with_mnemonic +gtk_label_select_region +gtk_label_set_mnemonic_widget +gtk_label_set_selectable +gtk_label_set_text_with_mnemonic GTK_LABEL GTK_IS_LABEL @@ -1162,6 +1192,8 @@ gtk_label_get_type GTK_LABEL_CLASS GTK_IS_LABEL_CLASS GTK_LABEL_GET_CLASS + +GtkLabelSelectionInfo
@@ -1257,8 +1289,6 @@ gtk_menu_reorder_child gtk_menu_popup gtk_menu_set_accel_group gtk_menu_get_accel_group -gtk_menu_get_uline_accel_group -gtk_menu_ensure_uline_accel_group gtk_menu_set_title gtk_menu_popdown @@ -1660,12 +1690,16 @@ gtk_progress_bar_pulse gtk_progress_bar_set_text gtk_progress_bar_set_fraction gtk_progress_bar_set_pulse_step +gtk_progress_bar_get_fraction +gtk_progress_bar_get_pulse_step +gtk_progress_bar_get_text gtk_progress_bar_new_with_adjustment gtk_progress_bar_set_bar_style gtk_progress_bar_set_discrete_blocks gtk_progress_bar_set_activity_step gtk_progress_bar_set_activity_blocks gtk_progress_bar_set_orientation +gtk_progress_bar_get_orientation gtk_progress_bar_update GTK_PROGRESS_BAR @@ -1722,20 +1756,8 @@ GtkRange gtk_range_get_adjustment gtk_range_set_update_policy gtk_range_set_adjustment -gtk_range_draw_background -gtk_range_draw_trough -gtk_range_draw_slider -gtk_range_draw_step_forw -gtk_range_draw_step_back -gtk_range_slider_update -gtk_range_trough_click -gtk_range_default_hslider_update -gtk_range_default_vslider_update -gtk_range_default_htrough_click -gtk_range_default_vtrough_click -gtk_range_default_hmotion -gtk_range_default_vmotion -gtk_range_clear_background +gtk_range_get_inverted +gtk_range_set_inverted GTK_RANGE GTK_IS_RANGE @@ -1840,6 +1862,43 @@ GTK_IS_SEPARATOR_CLASS GTK_SEPARATOR_GET_CLASS
+
+gtkseparatormenuitem +GtkSeparatorMenuItem +GtkSeparatorMenuItem +GtkSeparatorMenuItemClass +gtk_separator_menu_item_new + +GTK_SEPARATOR_MENU_ITEM +GTK_SEPARATOR_MENU_ITEM_CLASS +GTK_SEPARATOR_MENU_ITEM_GET_CLASS +GTK_IS_SEPARATOR_MENU_ITEM +GTK_IS_SEPARATOR_MENU_ITEM_CLASS +GTK_TYPE_SEPARATOR_MENU_ITEM +gtk_separator_menu_item_get_type + + +
+ +
+gtksettings +GtkSettings +GtkSettings +GtkSettingsClass +GtkSettingsValue + +GTK_IS_SETTINGS +GTK_IS_SETTINGS_CLASS +GTK_SETTINGS +GTK_SETTINGS_CLASS +GTK_SETTINGS_GET_CLASS +GTK_TYPE_SETTINGS + + +
+ + +
gtksocket GtkSocket @@ -1874,7 +1933,6 @@ gtk_spin_button_set_update_policy gtk_spin_button_set_numeric gtk_spin_button_spin gtk_spin_button_set_wrap -gtk_spin_button_set_shadow_type gtk_spin_button_set_snap_to_ticks gtk_spin_button_update GTK_INPUT_ERROR @@ -2005,6 +2063,7 @@ gtk_text_buffer_set_text gtk_text_buffer_get_text gtk_text_buffer_get_slice gtk_text_buffer_insert_pixbuf +gtk_text_buffer_insert_child_anchor gtk_text_buffer_create_child_anchor gtk_text_buffer_create_mark gtk_text_buffer_move_mark @@ -2026,9 +2085,9 @@ gtk_text_buffer_get_iter_at_line gtk_text_buffer_get_iter_at_line_index gtk_text_buffer_get_iter_at_mark gtk_text_buffer_get_iter_at_child_anchor -gtk_text_buffer_get_last_iter +gtk_text_buffer_get_end_iter gtk_text_buffer_get_bounds -gtk_text_buffer_modified +gtk_text_buffer_get_modified gtk_text_buffer_set_modified gtk_text_buffer_delete_selection gtk_text_buffer_paste_clipboard @@ -2082,12 +2141,15 @@ gtk_text_iter_ends_word gtk_text_iter_inside_word gtk_text_iter_starts_line gtk_text_iter_ends_line +gtk_text_iter_starts_sentence +gtk_text_iter_ends_sentence +gtk_text_iter_inside_sentence gtk_text_iter_is_cursor_position gtk_text_iter_get_chars_in_line gtk_text_iter_get_bytes_in_line gtk_text_iter_get_attributes gtk_text_iter_get_language -gtk_text_iter_is_last +gtk_text_iter_is_end gtk_text_iter_is_first gtk_text_iter_forward_char gtk_text_iter_backward_char @@ -2105,6 +2167,10 @@ gtk_text_iter_forward_cursor_position gtk_text_iter_backward_cursor_position gtk_text_iter_forward_cursor_positions gtk_text_iter_backward_cursor_positions +gtk_text_iter_backward_sentence_start +gtk_text_iter_backward_sentence_starts +gtk_text_iter_forward_sentence_end +gtk_text_iter_forward_sentence_ends gtk_text_iter_set_offset gtk_text_iter_set_line gtk_text_iter_set_line_offset @@ -2134,6 +2200,7 @@ gtk_text_mark_get_visible gtk_text_mark_get_deleted gtk_text_mark_get_name gtk_text_mark_get_buffer +gtk_text_mark_get_left_gravity GTK_TEXT_MARK GTK_IS_TEXT_MARK @@ -2202,6 +2269,7 @@ gtk_text_view_new_with_buffer gtk_text_view_set_buffer gtk_text_view_get_buffer gtk_text_view_scroll_to_mark +gtk_text_view_scroll_to_iter gtk_text_view_scroll_mark_onscreen gtk_text_view_move_mark_onscreen gtk_text_view_place_cursor_onscreen @@ -2260,6 +2328,7 @@ GtkTextBTree GtkTextChildBody GtkTextPixbuf GtkTextWindow +GtkTextPendingScroll
@@ -2291,6 +2360,8 @@ gtk_toggle_button_set_state gtk_toggle_button_toggled gtk_toggle_button_get_active gtk_toggle_button_set_active +gtk_toggle_button_get_inconsistent +gtk_toggle_button_set_inconsistent GTK_TOGGLE_BUTTON GTK_IS_TOGGLE_BUTTON @@ -2328,6 +2399,8 @@ gtk_toolbar_set_space_style gtk_toolbar_set_tooltips gtk_toolbar_set_button_relief gtk_toolbar_get_button_relief +gtk_toolbar_insert_stock +gtk_toolbar_set_icon_size GTK_TOOLBAR GTK_IS_TOOLBAR @@ -2455,8 +2528,8 @@ gtk_tree_model_iter_has_child gtk_tree_model_iter_n_children gtk_tree_model_iter_nth_child gtk_tree_model_iter_parent -gtk_tree_model_ref_iter -gtk_tree_model_unref_iter +gtk_tree_model_ref_node +gtk_tree_model_unref_node GTK_TREE_MODEL GTK_IS_TREE_MODEL @@ -2521,9 +2594,8 @@ gtk_tree_store_new gtk_tree_store_new_with_types gtk_tree_store_set_n_columns gtk_tree_store_set_column_type -gtk_tree_store_set_cell +gtk_tree_store_set_value gtk_tree_store_set -gtk_tree_store_get gtk_tree_store_remove gtk_tree_store_insert gtk_tree_store_insert_before @@ -2543,7 +2615,7 @@ GTK_IS_TREE_STORE_CLASS
gtktreeviewcolumn -GTK_TYPE_TREE_COLUMN +GTK_TYPE_TREE_VIEW_COLUMN GtkTreeViewColumn GtkTreeViewColumnSizing GtkTreeViewColumnFunc @@ -2569,8 +2641,8 @@ gtk_tree_view_column_get_title gtk_tree_view_column_set_clickable gtk_tree_view_column_set_widget gtk_tree_view_column_get_widget -gtk_tree_view_column_set_justification -gtk_tree_view_column_get_justification +gtk_tree_view_column_set_alignment +gtk_tree_view_column_get_alignment gtk_tree_view_column_clicked GTK_TREE_VIEW_COLUMN @@ -2620,24 +2692,6 @@ GTK_IS_TREE_VIEW_CLASS GtkTreeViewPrivate
-
-gtktreemodelsimple -GtkTreeModelSimple -GtkTreeModelSimple -gtk_tree_model_simple_new -gtk_tree_model_simple_changed -gtk_tree_model_simple_inserted -gtk_tree_model_simple_child_toggled -gtk_tree_model_simple_deleted - -GTK_TREE_MODEL_SIMPLE -GTK_IS_TREE_MODEL_SIMPLE -GTK_TYPE_TREE_MODEL_SIMPLE -gtk_tree_model_simple_get_type -GTK_TREE_MODEL_SIMPLE_CLASS -GTK_IS_TREE_MODEL_SIMPLE_CLASS -
-
gtkcellrenderer GtkCellRendererState @@ -2923,8 +2977,6 @@ gtk_widget_unrealize gtk_widget_queue_draw gtk_widget_queue_resize gtk_widget_draw -gtk_widget_draw_focus -gtk_widget_draw_default gtk_widget_size_request gtk_widget_get_child_requisition gtk_widget_size_allocate @@ -3010,6 +3062,14 @@ gtk_widget_set_composite_name gtk_widget_set_scroll_adjustments gtk_widget_unlock_accelerators gtk_widget_accelerators_locked +gtk_widget_activate_mnemonic +gtk_widget_class_install_style_property +gtk_widget_class_install_style_property_parser +gtk_widget_region_intersect +gtk_widget_send_expose +gtk_widget_style_get +gtk_widget_style_get_property +gtk_widget_style_get_valist GTK_WIDGET GTK_IS_WIDGET @@ -3040,7 +3100,24 @@ gtk_window_set_position gtk_window_set_transient_for gtk_window_set_destroy_with_parent gtk_window_list_toplevels -gtk_window_get_default_accel_group +gtk_window_activate_mnemonic +gtk_window_add_mnemonic +gtk_window_deiconify +gtk_window_iconify +gtk_window_maximize +gtk_window_present +gtk_window_remove_mnemonic +gtk_window_set_decorated +gtk_window_set_decorations_hint +gtk_window_set_frame_dimensions +gtk_window_set_functions_hint +gtk_window_set_has_frame +gtk_window_set_mnemonic_modifier +gtk_window_set_role +gtk_window_set_type_hint +gtk_window_stick +gtk_window_unmaximize +gtk_window_unstick GTK_WINDOW GTK_IS_WINDOW @@ -3429,9 +3506,7 @@ gtk_drag_dest_handle_event gtksignal Signals GTK_SIGNAL_OFFSET -GtkEmissionHook GtkSignalRunType -gtk_signal_init gtk_signal_new gtk_signal_newv gtk_signal_lookup @@ -3460,8 +3535,6 @@ gtk_signal_handler_unblock_by_func gtk_signal_handler_unblock_by_data gtk_signal_handler_pending gtk_signal_handler_pending_by_func -gtk_signal_add_emission_hook -gtk_signal_remove_emission_hook gtk_signal_default_marshaller @@ -3676,6 +3749,7 @@ GTK_STOCK_OPEN GTK_STOCK_QUIT GTK_STOCK_SAVE GTK_STOCK_CLOSE +GTK_STOCK_MISSING_IMAGE
@@ -3685,6 +3759,7 @@ GTK_STOCK_CLOSE GtkIconSource GtkIconFactory GtkIconSet +GtkIconSize gtk_icon_source_copy gtk_icon_source_free gtk_icon_factory_add @@ -3696,17 +3771,32 @@ gtk_icon_factory_remove_default gtk_icon_set_add_source gtk_icon_set_copy gtk_icon_set_new +gtk_icon_set_new_from_pixbuf gtk_icon_set_ref gtk_icon_set_render_icon gtk_icon_set_unref -GTK_ICON_SIZE_MENU -GTK_ICON_SIZE_BUTTON -GTK_ICON_SIZE_SMALL_TOOLBAR -GTK_ICON_SIZE_LARGE_TOOLBAR -GTK_ICON_SIZE_DIALOG gtk_icon_size_lookup gtk_icon_size_register gtk_icon_size_register_alias +gtk_icon_size_from_name +gtk_icon_size_get_name +gtk_icon_source_get_direction +gtk_icon_source_get_direction_wildcarded +gtk_icon_source_get_filename +gtk_icon_source_get_pixbuf +gtk_icon_source_get_size +gtk_icon_source_get_size_wildcarded +gtk_icon_source_get_state +gtk_icon_source_get_state_wildcarded +gtk_icon_source_new +gtk_icon_source_set_direction +gtk_icon_source_set_direction_wildcarded +gtk_icon_source_set_filename +gtk_icon_source_set_pixbuf +gtk_icon_source_set_size +gtk_icon_source_set_size_wildcarded +gtk_icon_source_set_state +gtk_icon_source_set_state_wildcarded GtkIconFactoryClass GTK_TYPE_ICON_FACTORY diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 9903f1f0ca..d8524c36b2 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1,3 +1,31 @@ + + +The #GtkData object is a very simple object intended to be used as a base +class for objects which contain data (i.e. the 'Model' in the object-oriented +Model/View/Controller framework). + + +Currently it is not very useful since all it provides is a "disconnect" signal. +This signal could be emitted by a #GtkData subclass to notify any 'Views' +that they should disconnect from the #GtkData (the 'Model'), possibly just +before the #GtkData is destroyed. + + + + + + + + + + +abstract base class for objects containing data. + + + +GtkData + + Debugging @@ -102,6 +130,26 @@ Signal Marshallers Private Information + + + + + + + + + + + + + + + + + +GtkModelSimple + + A macro to check whether a child widget of the CList @@ -875,6 +923,16 @@ Get the type of GtkIdentifier. @str: @Returns: + + + + + +@store: +@iter: +@column: +@value: + @@ -1266,6 +1324,16 @@ a gtk_object_unref(). @tree_model: @iter: + + + + + +@tree_store: +@iter: +@column: +@value: + Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml index 442da31201..a4a12188b7 100644 --- a/docs/reference/gtk/tmpl/gtkbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbox.sgml @@ -352,6 +352,15 @@ field in #GtkBoxChild-struct. in #GtkBoxChild-struct. + + + + + +@box: +@Returns: + + the minimum amount of space to put between children. Refers to the diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index db22ccf659..c182e2bff2 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -45,6 +45,24 @@ text. @Returns: The newly created #GtkButton widget. + + + + + +@label: +@Returns: + + + + + + + +@stock_id: +@Returns: + + Emits a #GtkButton::pressed signal to the given #GtkButton. diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index cf2929b1d6..a0f69d2d8e 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -57,3 +57,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: a #GtkWidget. + + + + + +@label: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index 0cbac1879e..d9ff6d64be 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -94,6 +94,24 @@ Emits the GtkCheckMenuItem::toggled signal. @check_menu_item: a #GtkCheckMenuItem. + + + + + +@check_menu_item: +@Returns: + + + + + + + +@check_menu_item: +@setting: + + This signal is emitted when the state of the check box is changed. diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index ec674dea8f..bf2233efbb 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -340,6 +340,33 @@ GtkContainer @container: + + + + + +@container: +@child: +@event: + + + + + + + +@container: +@focusable_widgets: + + + + + + + +@container: + + diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index f05199f418..9a38b69f3d 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -236,6 +236,43 @@ directly, but into the vbox and action_area, as described above. @widget: + + + + + +@dialog: +@Returns: + + + + + + + +@dialog: +@response_id: + + + + + + + +@dialog: +@setting: + + + + + + + +@dialog: +@response_id: +@setting: + + Emitted when an action widget is clicked, the dialog receives a delete event, or diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index 46aa77a6ec..1d8a8dea95 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -180,6 +180,60 @@ to fit. @max: the new maximum length. + + + + + +@entry: +@Returns: + + + + + + + +@entry: +@Returns: + + + + + + + +@entry: +@Returns: + + + + + + + +@entry: +@setting: + + + + + + + +@entry: +@setting: + + + + + + + +@entry: +@n_chars: + + diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index 077699e7d7..4c674d58c6 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -78,6 +78,15 @@ Set the shadow type for the Frame widget. @type: New shadow type. + + + + + +@frame: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkiconfactory.sgml b/docs/reference/gtk/tmpl/gtkiconfactory.sgml index ecd3592116..2eec513dfe 100644 --- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml +++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml @@ -52,6 +52,18 @@ looking up the icon to use for a given stock ID. + + + + + +@GTK_ICON_SIZE_INVALID: +@GTK_ICON_SIZE_MENU: +@GTK_ICON_SIZE_SMALL_TOOLBAR: +@GTK_ICON_SIZE_LARGE_TOOLBAR: +@GTK_ICON_SIZE_BUTTON: +@GTK_ICON_SIZE_DIALOG: + @@ -148,6 +160,15 @@ looking up the icon to use for a given stock ID. @Returns: + + + + + +@pixbuf: +@Returns: + + @@ -215,3 +236,173 @@ looking up the icon to use for a given stock ID. @target: + + + + + +@name: +@Returns: + + + + + + + +@size: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@Returns: + + + + + + + +@source: +@direction: + + + + + + + +@source: +@setting: + + + + + + + +@source: +@filename: + + + + + + + +@source: +@pixbuf: + + + + + + + +@source: +@size: + + + + + + + +@source: +@setting: + + + + + + + +@source: +@state: + + + + + + + +@source: +@setting: + + diff --git a/docs/reference/gtk/tmpl/gtkimcontext.sgml b/docs/reference/gtk/tmpl/gtkimcontext.sgml index 32e369676d..08377e4a42 100644 --- a/docs/reference/gtk/tmpl/gtkimcontext.sgml +++ b/docs/reference/gtk/tmpl/gtkimcontext.sgml @@ -74,6 +74,15 @@ GtkIMContext @context: + + + + + +@context: +@area: + + diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index b168ac0e2c..0aa71a049b 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -64,6 +64,15 @@ gtk_label_set_pattern(). @str: + + + + + +@label: +@str: + + The pattern of underlines you want under the existing text within the @@ -132,6 +141,91 @@ Gtk+ 1.0.x. + + + + + +@label: +@x: +@y: + + + + + + + +@label: +@Returns: + + + + + + + +@label: +@Returns: + + + + + + + +@label: +@Returns: + + + + + + + +@str: +@Returns: + + + + + + + +@label: +@start_offset: +@end_offset: + + + + + + + +@label: +@widget: + + + + + + + +@label: +@setting: + + + + + + + +@label: +@str: + +@string: + + The actual label text. Do not write to this pointer, it is not copied. diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml index e699ba365b..905920222c 100644 --- a/docs/reference/gtk/tmpl/gtkliststore.sgml +++ b/docs/reference/gtk/tmpl/gtkliststore.sgml @@ -58,17 +58,6 @@ GtkListStore @type: - - - - - -@store: -@iter: -@column: -@value: - - diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index e7f6ada83d..3943f02aa9 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -152,6 +152,33 @@ Creates a new #GtkProgressBar. @fraction: + + + + + +@pbar: +@Returns: + + + + + + + +@pbar: +@Returns: + + + + + + + +@pbar: +@Returns: + + Creates a new #GtkProgressBar with an associated #GtkAdjustment. @@ -215,6 +242,15 @@ grows. orientation and growth direction of the bar. + + + + + +@pbar: +@Returns: + + This function is deprecated. Please use gtk_progress_set_value() or diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index 46e45cb64d..8dd8930972 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -47,6 +47,24 @@ GtkRange @adjustment: + + + + + +@range: +@Returns: + + + + + + + +@range: +@setting: + + diff --git a/docs/reference/gtk/tmpl/gtkstock.sgml b/docs/reference/gtk/tmpl/gtkstock.sgml index 0345dc380e..9fb8fe7640 100644 --- a/docs/reference/gtk/tmpl/gtkstock.sgml +++ b/docs/reference/gtk/tmpl/gtkstock.sgml @@ -194,3 +194,10 @@ Stock Items + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index cfd32b85fd..196b97f202 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -230,6 +230,16 @@ types related to the text widget and how they work together. @pixbuf: + + + + + +@buffer: +@iter: +@anchor: + + @@ -457,6 +467,15 @@ types related to the text widget and how they work together. @anchor: + + + + + +@buffer: +@iter: + + @@ -467,6 +486,15 @@ types related to the text widget and how they work together. @end: + + + + + +@buffer: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml index 473e8342ca..1615165632 100644 --- a/docs/reference/gtk/tmpl/gtktextiter.sgml +++ b/docs/reference/gtk/tmpl/gtktextiter.sgml @@ -296,6 +296,33 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + @@ -342,6 +369,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + @@ -503,6 +539,44 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@count: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@count: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml index 22298d22de..1d3a9cff38 100644 --- a/docs/reference/gtk/tmpl/gtktextmark.sgml +++ b/docs/reference/gtk/tmpl/gtktextmark.sgml @@ -104,3 +104,12 @@ Marks are typically created using the gtk_text_buffer_create_mark() function. @Returns: + + + + + +@mark: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index 5d07a0e65c..dc9a5b8cdd 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -90,6 +90,20 @@ types related to the text widget and how they work together. @mark_within_margin: + + + + + +@text_view: +@iter: +@within_margin: +@use_align: +@xalign: +@yalign: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index 5a7fe1cf8e..15a339be11 100644 --- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml +++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml @@ -143,6 +143,24 @@ This action causes the toggled signal to be emitted. @is_active: TRUE or FALSE. + + + + + +@toggle_button: +@Returns: + + + + + + + +@toggle_button: +@setting: + + Should be connected if you wish to perform an action whenever the diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 921154df51..5d72861930 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -303,6 +303,32 @@ sets if the tooltips of a toolbar should be active or not. @Returns: + + + + + +@toolbar: +@stock_id: +@tooltip_text: +@tooltip_private_text: +@callback: +@user_data: +@position: +@Returns: + + + + + + + +@toolbar: +@icon_size: + +@stock_size: + + should be used if you wish to perform an action when the orientation of a toolbar is changed. diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 4d6dd8c746..1cd3fee5a7 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -349,3 +349,21 @@ gtktreemodel @Returns: + + + + + +@tree_model: +@iter: + + + + + + + +@tree_model: +@iter: + + diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml index 541fab7d83..8215040598 100644 --- a/docs/reference/gtk/tmpl/gtktreestore.sgml +++ b/docs/reference/gtk/tmpl/gtktreestore.sgml @@ -20,6 +20,7 @@ GtkTreeStore @parent: +@sort_list: @stamp: @root: @last: @@ -58,12 +59,14 @@ GtkTreeStore -@store: +@tree_store: @column: @type: + +@store: - + diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 23d8a43878..25628f2eaf 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -14,6 +14,13 @@ GtkTreeViewColumn + + + + + + + @@ -246,6 +253,24 @@ GtkTreeViewColumn @Returns: + + + + + +@tree_column: +@xalign: + + + + + + + +@tree_column: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index f5349f94d2..8132dfb3d8 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1247,6 +1247,85 @@ GtkWidget @Returns: + + + + + +@widget: +@group_cycling: +@Returns: + + + + + + + +@class: +@pspec: + + + + + + + +@class: +@pspec: +@parser: + + + + + + + +@widget: +@region: +@Returns: + + + + + + + +@widget: +@event: +@Returns: + + + + + + + +@widget: +@first_property_name: +@Varargs: + + + + + + + +@widget: +@property_name: +@value: + + + + + + + +@widget: +@first_property_name: +@var_args: + + diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index cd300a2606..d626ca1795 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -236,6 +236,167 @@ it's larger @Returns: + + + + + +@window: +@keyval: +@modifier: +@Returns: + + + + + + + +@window: +@keyval: +@target: + + + + + + + +@window: + + + + + + + +@window: + + + + + + + +@window: + + + + + + + +@window: + + + + + + + +@window: +@keyval: +@target: + + + + + + + +@window: +@setting: + + + + + + + +@window: +@decorations: + + + + + + + +@window: +@left: +@top: +@right: +@bottom: + + + + + + + +@window: +@functions: + + + + + + + +@window: + + + + + + + +@window: +@modifier: + + + + + + + +@window: +@role: + + + + + + + +@window: +@hint: + + + + + + + +@window: + + + + + + + +@window: + + + + + + + +@window: + + diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 3e4e3c8439..ebaa9ba9e8 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -287,13 +287,14 @@ gtk_im_context_reset (GtkIMContext *context) /** * gtk_im_context_set_cursor_location: * @context: a #GtkIMContext + * @area: new location * * Notify the input method that a change in cursor * position has been made. **/ void -gtk_im_context_set_cursor_location (GtkIMContext *context, - GdkRectangle *area) +gtk_im_context_set_cursor_location (GtkIMContext *context, + GdkRectangle *area) { GtkIMContextClass *klass; diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 42d6300f56..4de995ef26 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -532,11 +532,12 @@ gtk_label_set_mnemonic_widget (GtkLabel *label, /** * gtk_label_get_mnemonic_keyval: * @label: a #GtkLabel - * @Returns: GDK keyval usable for accelerators, or GDK_VoidSymbol * * If the label has been set so that it has an mnemonic key this function * returns the keyval used for the mnemonic accelerator. If there is no * mnemonic set up it returns #GDK_VoidSymbol. + * + * Returns: GDK keyval usable for accelerators, or GDK_VoidSymbol **/ guint gtk_label_get_mnemonic_keyval (GtkLabel *label) @@ -636,8 +637,8 @@ gtk_label_recalculate (GtkLabel *label) /** * gtk_label_set_text: - * label: a #GtkLabel - * str: a string + * @label: a #GtkLabel + * @str: a string * * Sets the text of the label to @str. * @@ -1904,7 +1905,7 @@ gtk_label_select_region (GtkLabel *label, * @x: location to store X offset of layout, or %NULL * @y: location to store Y offset of layout, or %NULL * - * Returns the coordinates where the label will draw the #PangoLayout + * Obtains the coordinates where the label will draw the #PangoLayout * representing the text in the label; useful to convert mouse events * into coordinates inside the #PangoLayout, e.g. to take some action * if some part of the label is clicked. Of course you will need to diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index bef1ca491e..ad676c650c 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -95,7 +95,7 @@ guint gtk_label_get_mnemonic_keyval (GtkLabel *label); void gtk_label_set_mnemonic_widget (GtkLabel *label, GtkWidget *widget); void gtk_label_set_text_with_mnemonic (GtkLabel *label, - const gchar *string); + const gchar *str); void gtk_label_set_justify (GtkLabel *label, GtkJustification jtype); void gtk_label_set_pattern (GtkLabel *label, diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index d6bcf65df0..e5800c0be1 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -858,6 +858,8 @@ gtk_toolbar_set_icon_size (GtkToolbar *toolbar, * @stock_id is not a known stock item ID, it's inserted verbatim, * except that underscores are used to mark mnemonics (see * gtk_label_new_with_mnemonic()). + * + * Returns: the inserted widget */ GtkWidget* gtk_toolbar_insert_stock (GtkToolbar *toolbar, diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index bec63423b5..c050c25b82 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -137,7 +137,7 @@ GtkWidget* gtk_toolbar_insert_item (GtkToolbar *toolbar, /* Stock Items */ void gtk_toolbar_set_icon_size (GtkToolbar *toolbar, - GtkIconSize stock_size); + GtkIconSize icon_size); GtkWidget* gtk_toolbar_insert_stock (GtkToolbar *toolbar, const gchar *stock_id, const char *tooltip_text, diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index f30fe8f608..68c2d0f2e2 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1079,9 +1079,9 @@ gtk_tree_model_reordered (GtkTreeModel *tree_model, } -/** - ** GtkTreeRowReference - **/ +/* + * GtkTreeRowReference + */ #define ROW_REF_DATA_STRING "gtk-tree-row-refs" diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index 6076cdbf53..9ae6940298 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -61,7 +61,7 @@ GtkTreeStore *gtk_tree_store_new_with_types (gint n_columns, ...); void gtk_tree_store_set_n_columns (GtkTreeStore *tree_store, gint n_columns); -void gtk_tree_store_set_column_type (GtkTreeStore *store, +void gtk_tree_store_set_column_type (GtkTreeStore *tree_store, gint column, GType type); void gtk_tree_store_set_value (GtkTreeStore *tree_store, -- 2.30.2